Merge
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 13 Nov 2009 15:46:58 +0000 (15:46 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 13 Nov 2009 15:46:58 +0000 (15:46 +0000)

Trivial merge